Minor tweaks to Bijection code