Clean up command signals a little bit