Fixed the version problems, maybe