Fixed first wave of errors.