Update with bugfixes