Compatibility changes for blakcomp