Small fixes before merge

See the 2 commits.