fixes for BMV