Few updates on typos and imports.