fixes for b3