Fixed issues with message types being passed around.