fixes for parsing combined messages