Post-refactoring bugfixes...