Fix for serviceUuids