FIX: Better py3k support

This makes tests pass on my machine.