misc bugfixes due to buglist