Several miscellaneous bugfixes in bench