Fixed files that didn't get fixed before