Fixing up to work on Virgo 3.0
11 files changed