Update with new fixes