Patches to make rexster work

this should go away also (as said on IRC)