Update with minor bugfixes