More analysis improvements