Fixing misc issues with teacher state update