Fixes and class changes