AMR work, warning fix