Fixes to desugar step