Fixes for adding External switch.