Some fixes to file directories