Improvements to clipping with amplification enabled