Minor tweaks and corrections