Post merge tweaks