Minor tweaks
Merge changes