Minor tweaks to BouncyBlock