Typo fixes and use of util to add checks (as it does other config changes), plus it is imutable