Fix for chrome bug (and some typos)