Labs: more gridengine class fixes

Change-Id: I7256213b86926167c857132474602bc580f1baa4