bugfixes from merges