Fix issues with skip_plots and cluster metric