Small improvements regarding dependencies.