Pull request feedback fixes