Fix merge error, minor tweaks