Fixes and Cloud support