Add arch for Solaris, tidy up getversion()