PostAnalytic fixes