Fixed mutliple typos #355