Do nasty things to get it to compile
Merge branch 'fix-core-version'