additional bugfixes