Minor changes

Explanations for some changes are in the respective commit message