Improved target device setting.