Latest norm_fit changes