Some tweaks

See the individual commits.