Fixes for bugs found during PyCon APAC Tutorial

I'm keeping this running during the track. Please don't merge it before the end of the day.