some changes according to our version of riakpbc