Merge: core: fix some "call on nullable" warnings