Task Steps further fixes