Small changes to Compute cmdlets