Fixes for regressions caused by the refactorings yesterday.