some tweaks to last merge