WCS20 fixes for trimming