Core compiles again