IAM Improvements

This improves IAM's behavior in ``cn-north-1`` under a couple conditions.

Review please? @danielgtaylor @jamesls