Fixes some classes