Misc cleanup, refactor missed references