A bit more cleanup and a few fixes that get aws-tools working