Non-core: a couple of changes from latest core