Fix mistypes

Not complete yet.