fix dependency resolution problems