Fixed post-refactor issues.