Minor fixes related to this week's refactoring