Update with fixes