Fix the versions mess and branches mess