Fix up all other modules broken by interface refactoring