More analyzer fixes