More version fixes