Small attempts to fix units bug

A couple of small changes in an attempt to fix a double up when
displaying units to join. Problem still exists