fixes for testing onechannelswiv