Fix tool offset handling, it should not be reflected in last_milestone