Fixing compilation due to package move in core