Minor tweaks and setup issues.