Fixing bugs cloudlet