Study teacher fixes