COOL and CLI adjustments