Fixes bugs in godrv