Minor changes to align with h5bp updates