Correction to CSI handling and introduction of APS