Fine tune deps and unions