analyzer tweaks