Update with some fixes