Fix bad class properties