some minor fixes for the classvars stuff