Minor tweeks and min version