Moved message types; transport prot fix.