Small tweaks & fixes.