Fixes to get service working with Smart Cloud