More reliable detection of version & cleanup
Use latest patches