Fixing EnableDelayedExpansion issues