Fixed core build.