GLRIDB-414 fixes for issues discovered after initial work