Fix remaining old style classes