Small changes

See commits.