Hi, I just pushed commits to salsa which hopefully fix the two FTBFS bugs in cbflib (at least it now build locally here). I hope someone has time to review and upload these changes. Best, Teemu