Additional fixes, mostly for plotting of bias studies in envelope method