updates for changes to core