fixing some edge cases and regressions with the recent @extend updates