Minor fixes to scene and file parser