SchoolNet small bugs