Correct some import/interface behavior