Various tweaks and fixes for small things.