SwC - working with azure fixes