Added some fixes to files