small fixes for aggregated state analysis