PyconZA 2013: Last few fixes