Minor fixes for PR.