[BF] Front end fixes