Various changes for supporting Broadcom/Avago