Better CLI diagnostics