Sync up with others
Cleanup version strings