Fix some new chase step issues