diff --git a/shared/generate_declarations.sh b/shared/generate_declarations.sh
index e3c2e28c..aba560ad 100644
--- a/shared/generate_declarations.sh
+++ b/shared/generate_declarations.sh
@@ -24,7 +24,7 @@ function generate_declaration() {
 
 #Generate the loader definitions first
 app_declaration="../declarations/shared-app/"
-generate_declaration dtsconfig_app.json ${app_declaration}
+generate_declaration tsconfig.declarations.json ${app_declaration}
 
 cp -r svg-sprites "../declarations/svg-sprites"
 exit 0
\ No newline at end of file
diff --git a/shared/js/connection/rtc/SdpUtils.ts b/shared/js/connection/rtc/SdpUtils.ts
index 99a2878e..6a429ebf 100644
--- a/shared/js/connection/rtc/SdpUtils.ts
+++ b/shared/js/connection/rtc/SdpUtils.ts
@@ -81,22 +81,11 @@ export class SdpProcessor {
         sdpString = sdpString.replace(/profile-level-id=4325407/g, "profile-level-id=42e01f");
 
         const sdp = sdpTransform.parse(sdpString);
-        //sdp.media.forEach(media => media.candidates = []);
-        //sdp.origin.address = "127.0.0.1";
         this.rtpRemoteChannelMapping = SdpProcessor.generateRtpSSrcMapping(sdp);
 
         return sdpTransform.write(sdp);
     }
 
-    /*
-    getCandidates(sdpString: string) : string[] {
-        const sdp = sdpTransform.parse(sdpString);
-        sdp.media = [sdp.media[0]];
-        sdpTransform.write(sdp).split("\r\n")
-            .filter(line => line.startsWith("a"))
-    }
-     */
-
     processOutgoingSdp(sdpString: string, _mode: "offer" | "answer") : string {
         const sdp = sdpTransform.parse(sdpString);
 
diff --git a/shared/js/ui/modal/video-source/Controller.tsx b/shared/js/ui/modal/video-source/Controller.tsx
index 0e4b6a05..2c42a2bf 100644
--- a/shared/js/ui/modal/video-source/Controller.tsx
+++ b/shared/js/ui/modal/video-source/Controller.tsx
@@ -46,13 +46,22 @@ export async function spawnVideoSourceSelectModal(type: VideoBroadcastType, sele
     });
 
     let refSource: { source: VideoSource } = { source: undefined };
-    controller.events.on("action_start", () => refSource.source = controller.getCurrentSource()?.ref());
+    controller.events.on("action_start", () => {
+        refSource.source?.deref();
+        refSource.source = controller.getCurrentSource()?.ref();
+    });
 
     await new Promise(resolve => {
         if(defaultSelectSource && selectMode === "quick") {
-            controller.events.one("notify_video_preview", event => {
+            const callbackRemove = controller.events.on("notify_video_preview", event => {
+                if(event.status.status === "error") {
+                    callbackRemove();
+                }
+
                 if(event.status.status === "preview") {
                     /* we've successfully selected something */
+                    refSource.source = controller.getCurrentSource()?.ref();
+                    modal.hide();
                     modal.destroy();
                 }
             });
diff --git a/shared/js/ui/react-elements/Icon.tsx b/shared/js/ui/react-elements/Icon.tsx
index d41e72e2..28d975c0 100644
--- a/shared/js/ui/react-elements/Icon.tsx
+++ b/shared/js/ui/react-elements/Icon.tsx
@@ -37,7 +37,7 @@ export const RemoteIconRenderer = (props: { icon: RemoteIcon, className?: string
                 return <div key={"loaded"} className={cssStyle.container + " icon_em client-group_" + props.icon.iconId + " " + props.className} title={props.title} />;
             }
             return (
-                <div key={"icon-" + props.icon.iconId} className={cssStyle.container + "icon-container " + props.className}>
+                <div key={"icon-" + props.icon.iconId} className={cssStyle.container + " icon-container " + props.className}>
                     <img style={{ maxWidth: "100%", maxHeight: "100%" }} src={props.icon.getImageUrl()} alt={props.title || ("icon " + props.icon.iconId)} draggable={false} />
                 </div>
             );