Typos fixed and build-warnings cleared