Tweaks and fixes.