Fix metadata dependencies to allow null on bootup