Fixed some files for submission