Fixed some more files