after-BARF fixups