Minor changes

Did some more minor changes there and there; see the individual commits.