A bunch of little fixes to work with Savon version 2