Updates for latest changes to core