Minor refactor fixes.