[BF] Fixes after review