Tweak things to better match prototype