More changes to make .ocd happy on Linux.