Grn fixes
Merge pull request #542 from sandal-smuggler/GRN-Fix-106

Grn fixes