Patches to make rexster work