//multiple small fix on carrier wizard