Class hotfixes

Back to top button