Fixes for PR review