fix vanilla (spout) imports