Fixes for Pull Request.