Fix notices in CLI mode