Change return on certain commands to avoid double messages.