minor changes in core