Some final tweaks and fixes.