Updated a couple other import statements

Cherry-pick of the one real commit of #341.