Some tweaks to versioning of libs