More fixes

More fixes to ensure neutral file relations, etc.