Fixes based on PR review