diff --git a/app/build.gradle b/app/build.gradle
index 615f986fd..67f9bcb79 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -170,6 +170,7 @@ android {
             }
         }
         wavevr {
+            minSdkVersion build_versions.min_sdk_wave
             dimension "platform"
             externalNativeBuild {
                 cmake {
@@ -235,6 +236,8 @@ android {
                 'svrArm64Release',
                 'wavevrArmDebug',
                 'wavevrArmRelease',
+                'wavevrArm64Debug',
+                'wavevrArm64Release',
                 'noapiArmDebug',
                 'noapiArmRelease',
                 'noapiArm64Debug',
diff --git a/app/src/wavevr/cpp/DeviceDelegateWaveVR.cpp b/app/src/wavevr/cpp/DeviceDelegateWaveVR.cpp
index b12c65224..b75c16883 100644
--- a/app/src/wavevr/cpp/DeviceDelegateWaveVR.cpp
+++ b/app/src/wavevr/cpp/DeviceDelegateWaveVR.cpp
@@ -135,7 +135,8 @@ struct DeviceDelegateWaveVR::State {
     vrb::RenderContextPtr render = context.lock();
     for (int ix = 0; ix < WVR_GetTextureQueueLength(aTextureQueue); ix++) {
       vrb::FBOPtr fbo = vrb::FBO::Create(render);
-      fbo->SetTextureHandle((GLuint)WVR_GetTexture(aTextureQueue, ix).id, renderWidth, renderHeight, attributes);
+      uintptr_t handle = (uintptr_t)WVR_GetTexture(aTextureQueue, ix).id;
+      fbo->SetTextureHandle((GLuint)handle, renderWidth, renderHeight, attributes);
       if (fbo->IsValid()) {
         aFBOQueue.push_back(fbo);
       } else {
diff --git a/app/src/wavevr/cpp/native-lib.cpp b/app/src/wavevr/cpp/native-lib.cpp
index 9b48b90ef..5ce1f7e31 100644
--- a/app/src/wavevr/cpp/native-lib.cpp
+++ b/app/src/wavevr/cpp/native-lib.cpp
@@ -63,7 +63,7 @@ int main(int argc, char *argv[]) {
 
   // Must initialize render runtime before all OpenGL code.
   WVR_RenderInitParams_t param;
-  param = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_Timewarp_Asynchronous };
+  param = { WVR_GraphicsApiType_OpenGL, WVR_RenderConfig_Default };
 
   WVR_RenderError pError = WVR_RenderInit(&param);
   if (pError != WVR_RenderError_None) {
diff --git a/tools/taskcluster/build_targets.py b/tools/taskcluster/build_targets.py
index f240447d7..bfdec9801 100644
--- a/tools/taskcluster/build_targets.py
+++ b/tools/taskcluster/build_targets.py
@@ -36,7 +36,7 @@
    'oculusvr': ['arm', 'arm64'],
    'oculusvrStore': ['arm', 'arm64'],
    'oculusvr3dofStore': ['arm', 'arm64'],
-   'wavevr': ['arm'],
+   'wavevr': ['arm', 'arm64'],
    'googlevr': ['arm', 'arm64'],
    'noapi': ['arm', 'arm64', 'x86'],
    'svr': ['arm', 'arm64'],
diff --git a/versions.gradle b/versions.gradle
index 756b75e2a..510292e9e 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -129,6 +129,7 @@ ext.deps = deps
 
 def build_versions = [:]
 build_versions.min_sdk = 24
+build_versions.min_sdk_wave = 25
 build_versions.target_sdk = 28
 build_versions.build_tools = "28.0.3"
 ext.build_versions = build_versions