Fixes after PR review.