Fixed remaining fallout from the refactor