Tweaks for making+fixing