Fixing some derpy errors in the message routing