Tweak the interfaces a bit.