Step management and where fixes