More analysis updates