Fix for building Core with updated dependencies