fixes & back to azure