Small fixes

Fixes for a couple of small things I ran into whilst refactoring locust to run on top of requests 1.2