Adjustments for Gold CLI