WCS20 Fixes for trimming