Multiple tweaks for Unit assignation