Fixes to bplus index implementation