Fix few warnings