More tweaks and fixes.