Fixing up global properties in classes