minor fixes for PR review