Followup fixes for boto_iam