Some tweaks and fixes.