Tweaks, fixes...