Further small tweaks due to copy pasta errors.