Some more file management changes