Several improvements for fake.Cloud