Tweaks to allow overflow etc.