diff --git a/.gitignore b/.gitignore
index 1aa7e98b86..8bda44e64f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
 *.sdf
 *.opensdf
 *.opendb
+*.VC.db
 /Telegram/*.aps
 /Win32/
 ipch/
diff --git a/Telegram/SourceFiles/core/basic_types.h b/Telegram/SourceFiles/core/basic_types.h
index 41d42cc573..af03d5808d 100644
--- a/Telegram/SourceFiles/core/basic_types.h
+++ b/Telegram/SourceFiles/core/basic_types.h
@@ -996,7 +996,7 @@ public:
 
 	ComposerMetadata(uint64 mask) : size(0), last(64), _mask(mask) {
 		for (int i = 0; i < 64; ++i) {
-			uint64 m = (1 << i);
+			uint64 m = (1ULL << i);
 			if (_mask & m) {
 				int s = ComponentWraps[i].Size;
 				if (s) {
diff --git a/Telegram/build/vc/codegen_numbers/codegen_numbers.vcxproj b/Telegram/build/vc/codegen_numbers/codegen_numbers.vcxproj
index 0825b51f71..8591f9a6a9 100644
--- a/Telegram/build/vc/codegen_numbers/codegen_numbers.vcxproj
+++ b/Telegram/build/vc/codegen_numbers/codegen_numbers.vcxproj
@@ -114,7 +114,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="QtStatic" MocOptions="" />
+      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="$(DefaultQtVersion)" MocOptions="" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Telegram/build/vc/codegen_style/codegen_style.vcxproj b/Telegram/build/vc/codegen_style/codegen_style.vcxproj
index 143842fa89..a3c2990657 100644
--- a/Telegram/build/vc/codegen_style/codegen_style.vcxproj
+++ b/Telegram/build/vc/codegen_style/codegen_style.vcxproj
@@ -120,7 +120,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="QtStatic" MocOptions="" />
+      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="$(DefaultQtVersion)" MocOptions="" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file