Minor changes

~~Including previous commits (other pull request(s))~~