Resolve version ordering issues