Fixing mismatch and insufficient lenght of fields.