Tweak imports and kernel interface.