Small fixes (in device selection CLI version and small improvements in GUI).