more fixes for omniswitch

Change-Id: I79f1116a98ea9295438b766fc1bd0fc9557d57c8