More Faker improvements