More fixes post Faker.