Fix old style classes