a few more warnings removed