diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
index f0b9a21..d9db539 100644
--- a/src/vrend_renderer.c
+++ b/src/vrend_renderer.c
@@ -5646,7 +5646,8 @@ vrend_renderer_fini(void)
    if (!vrend_state.inited)
       return;
 
-   vrend_resource_set_destroy_callback(vrend_renderer_resource_destroy);
+   typedef  void (*destroy_callback)(void *);
+   vrend_resource_set_destroy_callback((destroy_callback)vrend_renderer_resource_destroy);
 
    vrend_free_sync_thread();
    if (vrend_state.eventfd != -1) {
diff --git a/vtest/vtest_renderer.c b/vtest/vtest_renderer.c
index fc99c76..430f8f8 100644
--- a/vtest/vtest_renderer.c
+++ b/vtest/vtest_renderer.c
@@ -614,9 +614,9 @@ int vtest_transfer_get_nop(UNUSED uint32_t length_dw)
 {
    uint32_t thdr_buf[VCMD_TRANSFER_HDR_SIZE];
    int ret;
-   int level;
-   uint32_t stride, layer_stride, handle;
-   struct virgl_box box;
+   UNUSED int level;
+   UNUSED uint32_t stride, layer_stride, handle;
+   UNUSED struct virgl_box box;
    uint32_t data_size;
    void *ptr;
 
@@ -700,9 +700,9 @@ int vtest_transfer_put_nop(UNUSED uint32_t length_dw)
 {
    uint32_t thdr_buf[VCMD_TRANSFER_HDR_SIZE];
    int ret;
-   int level;
-   uint32_t stride, layer_stride, handle;
-   struct virgl_box box;
+   UNUSED int level;
+   UNUSED uint32_t stride, layer_stride, handle;
+   UNUSED struct virgl_box box;
    uint32_t data_size;
    void *ptr;
 
@@ -792,9 +792,9 @@ int vtest_transfer_get2_nop(UNUSED uint32_t length_dw)
 {
    uint32_t thdr_buf[VCMD_TRANSFER2_HDR_SIZE];
    int ret;
-   int level;
+   UNUSED int level;
    uint32_t handle;
-   struct virgl_box box;
+   UNUSED struct virgl_box box;
    uint32_t offset;
    struct iovec *iovec;
 
@@ -859,11 +859,11 @@ int vtest_transfer_put2_nop(UNUSED uint32_t length_dw)
 {
    uint32_t thdr_buf[VCMD_TRANSFER2_HDR_SIZE];
    int ret;
-   int level;
+   UNUSED int level;
    uint32_t handle;
-   struct virgl_box box;
+   UNUSED struct virgl_box box;
    UNUSED uint32_t data_size;
-   uint32_t offset;
+   UNUSED uint32_t offset;
    struct iovec *iovec;
 
    ret = renderer.input->read(renderer.input, thdr_buf, sizeof(thdr_buf));