Minor fixes. #1615