Update with production corrections