Various fixes to versions