Fixed dependencies in a few packages