Analysis tweaks