Upgrade to azure sdk 2.1 and more bugg hunting fixes