Remove few warnings