bugfixes that were caused by the merge