Fixed mayor File loading bugs