[BF] More code fixes