few warnings fixed