Minor tweaks and doc typo fix