many fixes for <13 messaging