Minor changes to version handling