School & SP Fixes