Minor tweaks and polish