Various

See the commits.