Fix linux problems after osx versioning commit