Fix cli help messages with new defaults handling