Try to fix remaining Python 3 errors