Analytic solution fixes