Fixed few warnings..