Fixed typos, additional warnings