diff --git a/src/capture/nvfbc.c b/src/capture/nvfbc.c
index a907dd9..bd6c2b1 100644
--- a/src/capture/nvfbc.c
+++ b/src/capture/nvfbc.c
@@ -288,7 +288,7 @@ static int gsr_capture_nvfbc_start(gsr_capture *cap, gsr_capture_metadata *captu
     capture_metadata->video_height = self->tracking_height;
 
     if(self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0) {
-        self->params.output_resolution = scale_keep_aspect_ratio((vec2i){capture_metadata->recording_width, capture_metadata->recording_height}, self->params.output_resolution);
+        self->params.output_resolution = scale_keep_aspect_ratio((vec2i){capture_metadata->video_width, capture_metadata->video_height}, self->params.output_resolution);
         capture_metadata->video_width = self->params.output_resolution.x;
         capture_metadata->video_height = self->params.output_resolution.y;
     } else if(self->params.region_size.x > 0 && self->params.region_size.y > 0) {
diff --git a/src/main.cpp b/src/main.cpp
index 8329877..d678613 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3661,6 +3661,7 @@ int main(int argc, char **argv) {
                         audio_device.frame->pts += audio_track.codec_context->frame_size;
                         num_received_frames++;
                     } else {
+                        // TODO: Maybe sleep for time_to_sleep_until_next_frame/4? for better latency
                         const double time_after_read_seconds = clock_get_monotonic_seconds();
                         const double time_to_read_seconds = time_after_read_seconds - time_before_read_seconds;
                         const double time_to_sleep_until_next_frame = timeout_sec - time_to_read_seconds;