fixes to handle oversize messages and on the spot fixes predemo