Fixing File class issues