Minor analyzer fixes