[BF] Minor changes.