Minor tweaks and fixes.