l2_switch_v1_3.py fixes