Fixed solution version generation and related stuff