Class syntax fixes