Resolve py 3.4 failures