Fixups to azure import