Add some more fixes which allow for proper modernization skip