Tweaks to previous merge