Build script fixes to work on both python 2 and 3