More dependency fixes

More runtime dependency fixes