Minor tweaks
minors changes to support merging