Some improv in FixCommonErrors