Fixing various files