other bugfixes