Misc fixes and improvements from Tutor