Minor changes in core