Some more missed import fixes