Minor fixes. CHECK STYLE AND SQUASH.