Fix a bug and change few values.