more fixes for errorspam