Tweaks following feedback from m