Small tweaks and maybe fixes.