Fixing issues noted in PR