more message build improvements