Bug fixes in cloud