[BF] Fixes after review

Small code fixes after review