Corrections on MA shortening handling