some more warnings removed