partial fix for GCOD-478
fix for GCOD-459
fix for GCOD-510
Merge pull request #273 from deniszgonjanin/master

A few more minor issue fixes.