Few more post-refactor fixes.