Bug fixes
Merge branch 'school/admin' into develop