Two warnings removed