Tweaks for h5bp branch