Fixed some "expected" length errors.