Fixes to bipartitions calculations