Fixes for /DEMOFILE