Fixed typos and imports