Improve tick and step heuristics