Small tweaks and fixes.