Fixed issue where buildings and units weren't being assigned to the
proper users