Fix bcv remarks