Fixes in classes