Fixes for pull requests applied earlier.