Misc tweaks and fixes.