Small tweaks from @adrn's changes