More dep. fixes