Python3.4 compatibility updates