Some changes version string handling