diff --git a/reactos/base/applications/applications.rbuild b/reactos/base/applications/applications.rbuild
index b4820c3c145..38fe357b60c 100644
--- a/reactos/base/applications/applications.rbuild
+++ b/reactos/base/applications/applications.rbuild
@@ -34,6 +34,9 @@
 <directory name="mscutils">
 	<xi:include href="mscutils/directory.rbuild" />
 </directory>
+<directory name="mstsc">
+	<xi:include href="mstsc/mstsc.rbuild" />
+</directory>
 <directory name="network">
 	<xi:include href="network/network.rbuild" />
 </directory>
diff --git a/reactos/base/applications/mstsc/pstcache.c b/reactos/base/applications/mstsc/pstcache.c
index 559f80a273c..8b7a9e2cd06 100644
--- a/reactos/base/applications/mstsc/pstcache.c
+++ b/reactos/base/applications/mstsc/pstcache.c
@@ -53,7 +53,7 @@ pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx)
 {
 	uint8 *celldata;
 	int fd;
-    CELLHEADER cellhdr = {0,};
+	CELLHEADER cellhdr;
 	HBITMAP bitmap;
 
 	if (!g_bitmap_cache_persist_enable)
@@ -62,6 +62,8 @@ pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx)
 	if (!IS_PERSISTENT(cache_id) || cache_idx >= BMPCACHE2_NUM_PSTCELLS)
 		return False;
 
+	memset(&cellhdr, 0, sizeof(CELLHEADER));
+
 	fd = g_pstcache_fd[cache_id];
 	rd_lseek_file(fd, cache_idx * (g_pstcache_Bpp * MAX_CELL_SIZE + sizeof(CELLHEADER)));
 	rd_read_file(fd, &cellhdr, sizeof(CELLHEADER));
diff --git a/reactos/base/applications/mstsc/win32.c b/reactos/base/applications/mstsc/win32.c
index 84333c8bb71..016768ecb8b 100644
--- a/reactos/base/applications/mstsc/win32.c
+++ b/reactos/base/applications/mstsc/win32.c
@@ -92,7 +92,7 @@ uni_to_str(char * sizex, TCHAR * size1)
   len = _tcslen(size1);
   for (i = 0; i < len; i++)
   {
-    sizex[i] = (char *)size1[i];
+    sizex[i] = (char)size1[i];
   }
   sizex[len] = 0;
 }