Tweaks and fixes...