Small tweaks to title handling