fixes for classes special and builtin