Fixes for dependencies for tools in core