Last changes before typo-checking.