Tweaks to preset handling