Minor tweaks to fix some small issues.