Fixing class_variable_get/set