a few more related bugfixes