Minor tweaks and fixes