Fix last typo problems