Fix setup and version numbering