File manager - Cleanup and creation fixes