BS3 fixes for error msgs