More dependency fiddling