minor warnings removed