removed few warnings