analytic fixes