Minor tweaks and setup fixes.