Improve version handling.