thread / current step fixes