Updates for osiam and openaz