Fixes for regressions caused by other bugfixes