Minor changes to relay and command handler.