Fixed warning handling