More messaging improvements for BAU-116