Various analysis fixes.