diff --git a/cmake/modules/FindBrotli.cmake b/cmake/modules/FindBrotli.cmake
index 2229b29b..abcdf174 100755
--- a/cmake/modules/FindBrotli.cmake
+++ b/cmake/modules/FindBrotli.cmake
@@ -1,5 +1,5 @@
 find_package(PkgConfig)
-pkg_check_modules(PC_BROTLIDEC libbrotlidec)
+pkg_check_modules(PC_BROTLIDEC libbrotlicommon)
 
 find_path(BROTLIDEC_INCLUDE_DIRS
     NAMES brotli/decode.h
@@ -8,28 +8,29 @@ find_path(BROTLIDEC_INCLUDE_DIRS
 )
 
 find_library(BROTLIDEC_LIBRARIES
-    NAMES brotlidec
+    NAMES brotlidec brotlidec-static
     HINTS ${PC_BROTLIDEC_LIBDIR}
     ${PC_BROTLIDEC_LIBRARY_DIRS}
 )
 
-find_path(BROTLIDENC_INCLUDE_DIRS
+find_path(BROTLIENC_INCLUDE_DIRS
     NAMES brotli/encode.h
     HINTS ${PC_BROTLIDEC_INCLUDEDIR}
     ${PC_BROTLIDEC_INCLUDE_DIRS}
 )
 
 find_library(BROTLIENC_LIBRARIES
-    NAMES brotlienc
+    NAMES brotlienc brotlienc-static
     HINTS ${PC_BROTLIDEC_LIBDIR}
     ${PC_BROTLIDEC_LIBRARY_DIRS}
 )
 find_library(BROTLICOMMON_LIBRARIES
-    NAMES brotlicommon
+    NAMES brotlicommon brotlicommon-static
     HINTS ${PC_BROTLIDEC_LIBDIR}
     ${PC_BROTLIDEC_LIBRARY_DIRS}
 )
 include(FindPackageHandleStandardArgs)
+
 if(BROTLIDEC_INCLUDE_DIRS AND BROTLIDEC_LIBRARIES)
    set(BROTLIDEC_FOUND TRUE)
    set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES})
diff --git a/src/gui/view/view.cc b/src/gui/view/view.cc
index 414922f2..7e108dd2 100755
--- a/src/gui/view/view.cc
+++ b/src/gui/view/view.cc
@@ -1458,6 +1458,7 @@ Parcelable View::onSaveInstanceState(){
     }
     return BaseSavedState.EMPTY_STATE;
 #endif
+    return Parcelable();
 }
 
 void View::restoreHierarchyState(std::map<int,Parcelable>& container){