[avswitch] some little changes back