More warning fix