Base: Minor tweaks and rewording