Fix command logic and forge version bump