Fix remaining cases of leaking imports