Fixes to make the build command work on py3k.