AHCI/SILI - More adjustments to last commit