bugfixes post-merge