Changes related to def-core changes