Logical Switches range bugfixes (both Companion and Firmware)