Fixes for simultaneous Python 2 and 3 compatibility