Fixing few warnings