Fix some typos, robustify setup