Faker changes to be compatible with CLI tools.