Fixes class errors