Files and error fixes