Various small changes

See commits for further detail.