fixes for switch sending