BUG: Fixes in response to refactoring.