More changes to the build in order to make it build only core library.