Tweak api a bit