Fix everything except for 'this in a static method'