AH-384 Small fix in Release mode
AH-384 Some changes in the file loader.