Minor tweaks to match creation, API fix and more.