Bug fix, CPE Messagetype support (now to spec!)