Fix up some of the commands called in system tray app