bugfixes due to merge