Simple changes

See the commit messages to know more.