Tweaks and merging