Fixes a few things left over from the 2to3 conversion