Fixed few warnings and typos