- Fix compile and move version changes out of the wrong patch