Fix core-list issue, other improvements.