Minor warnings removed