Re #1709 - Fixed dependencies to reflect Corelib changes