Some clean up
Merge branch 'curl-fixes-wip' of github.com:juruen/cavalieri into curl-fixes-backwards