Additional version fixes that were missed earlier