File create fixes