Minor tweaks and small issue fixes.