Fix class options