School Fixes (misc)