Hotfixes for "teacher release"