diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
index a05da25292..3b43bee7b1 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
@@ -28,12 +28,12 @@ static PlacePageDataSchedule convertOpeningHours(std::string rawOpeningHours) {
   return PlacePageDataOpeningHoursUnknown;
 }
 
-static PlacePageDataHotelType convertHotelType(boost::optional<ftypes::IsHotelChecker::Type> hotelType) {
+static PlacePageDataHotelType convertHotelType(std::optional<ftypes::IsHotelChecker::Type> hotelType) {
   if (!hotelType.has_value()) {
     return PlacePageDataHotelTypeNone;
   }
 
-  switch (hotelType.get()) {
+  switch (*hotelType) {
     case ftypes::IsHotelChecker::Type::Hotel:
       return PlacePageDataHotelTypeHotel;
     case ftypes::IsHotelChecker::Type::Apartment:
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
index ae34f391db..72941eaec7 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@@ -951,7 +951,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type)
   }
   [Statistics logEvent:kStatUGCReviewStart
         withParameters:@{
-          kStatIsAuthenticated: @([MWMAuthorizationViewModel isAuthenticated]),
+          kStatIsAuthenticated: @([MWMUser isAuthenticated]),
           kStatIsOnline: @(GetPlatform().ConnectionStatus() != Platform::EConnectionType::CONNECTION_NONE),
           kStatMode: kStatAdd,
           kStatFrom: sourceString
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m
index 12a4003011..c5bf205f09 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m
@@ -1,6 +1,6 @@
 #import "MWMActionBarButton.h"
 #import "MWMButton.h"
-#import "MWMCircularProgress+Swift.h"
+#import "MWMCircularProgress.h"
 
 NSString * titleForPartner(NSInteger partnerIndex)
 {