fixing type some bugs
Clean update / diff with azure sql