Fix #841.
Fix #843 (tooltip in core list).