More version fixes for master branch