Some python 2 and 3 compatiblity fixes