More improvements

See commit messages for details.