diff --git a/qrenderdoc/Code/Interface/Extensions.h b/qrenderdoc/Code/Interface/Extensions.h
index fcb7362da..c7f60e48b 100644
--- a/qrenderdoc/Code/Interface/Extensions.h
+++ b/qrenderdoc/Code/Interface/Extensions.h
@@ -682,7 +682,7 @@ added anywhere.
 :param QWidget layout: The layout widget.
 :param int spacing: The spacing in pixels to use between items
 )");
-  virtual void SetLayoutSpacing(QWidget *layout, int spacing) = 0;
+  virtual void SetLayoutSpacing(QWidget *layout, int32_t spacing) = 0;
 
   DOCUMENT(R"(Set the external margins on the outside of all of the items in the layout. If
 the widget is not a layout (either grid or horizontal/vertical) this call will have no effect.
@@ -691,7 +691,7 @@ the widget is not a layout (either grid or horizontal/vertical) this call will h
 :param int horizontal: The horizontal margins on the left and right.
 :param int vertical: The vertical margins on the top and bottom.
 )");
-  virtual void SetLayoutMargins(QWidget *layout, int horizontal, int vertical) = 0;
+  virtual void SetLayoutMargins(QWidget *layout, int32_t horizontal, int32_t vertical) = 0;
 
   // widget manipulation
 
diff --git a/renderdoc/api/replay/renderdoc_replay.h b/renderdoc/api/replay/renderdoc_replay.h
index 333bb52fd..8496ff64f 100644
--- a/renderdoc/api/replay/renderdoc_replay.h
+++ b/renderdoc/api/replay/renderdoc_replay.h
@@ -2042,8 +2042,8 @@ This function will block until a remote connection tells the server to shut down
   Callback function signature must match :func:`PreviewWindowCallback`.
 )");
 extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_BecomeRemoteServer(
-    const rdcstr &listenhost, uint16_t port, RENDERDOC_KillCallback killReplay,
-    RENDERDOC_PreviewWindowCallback previewWindow);
+    const rdcstr &listenhost, uint16_t port, RENDERDOC_KillCallback killReplay = NULL,
+    RENDERDOC_PreviewWindowCallback previewWindow = NULL);
 
 //////////////////////////////////////////////////////////////////////////
 // Injection/execution capture functions.