Fix cs
Fix argument resolving for steps