fixes for PR review