Small tweaks from Sunday