[review BJ] Fixes after review ground zero