Warning analyzer fixes