AHCI - follow fixes to CAM