diff --git a/generator/booking_quality_check/booking_quality_check.cpp b/generator/booking_quality_check/booking_quality_check.cpp
index 1d189e1b77..fe38b95269 100644
--- a/generator/booking_quality_check/booking_quality_check.cpp
+++ b/generator/booking_quality_check/booking_quality_check.cpp
@@ -351,9 +351,9 @@ string GetDatasetFilePath<OpentableDataset>(feature::GenerateInfo const & info)
 template <typename Dataset, typename Object = typename Dataset::Object>
 void RunImpl(feature::GenerateInfo & info)
 {
-  // TODO(mgsergio): Log correctly LOG_SHORT(LINFO, ("Booking data:", FLAGS_booking));
-  Dataset dataset(GetDatasetFilePath<Dataset>(info));
-  LOG_SHORT(LINFO, (dataset.Size(), "objects are loaded from a Dataset."));
+  auto const & dataSetFilePath = GetDatasetFilePath<Dataset>(info);
+  Dataset dataset(dataSetFilePath);
+  LOG_SHORT(LINFO, (dataset.Size(), "objects are loaded from a file:", dataSetFilePath));
 
   map<osm::Id, FeatureBuilder1> features;
   GenerateFeatures(info, [&dataset, &features](feature::GenerateInfo const & /* info */)
diff --git a/generator/booking_quality_check/booking_quality_check.pro b/generator/booking_quality_check/booking_quality_check.pro
index 4866b8f78c..9f5b1c4892 100644
--- a/generator/booking_quality_check/booking_quality_check.pro
+++ b/generator/booking_quality_check/booking_quality_check.pro
@@ -31,6 +31,10 @@ INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src
 
 QT *= core
 
+macx-* {
+  LIBS *= "-framework IOKit" "-framework SystemConfiguration"
+}
+
 SOURCES += \
   booking_quality_check.cpp \
 
diff --git a/generator/booking_scoring.cpp b/generator/booking_scoring.cpp
index 1daad49908..78b6baa096 100644
--- a/generator/booking_scoring.cpp
+++ b/generator/booking_scoring.cpp
@@ -26,7 +26,7 @@ bool MatchStats<BookingHotel>::IsMatched() const
   return GetMatchingScore() > kOptimalThreshold;
 }
 
-// TODO(mgsergio): Do I need to spesialize this method?
+// TODO(mgsergio): Do I need to specialize this method?
 template <>
 MatchStats<BookingHotel> Match(BookingHotel const & h, FeatureBuilder1 const & fb)
 {
diff --git a/generator/restaurants_info/restaurants_info.pro b/generator/restaurants_info/restaurants_info.pro
index 32b98b77e0..dd1a818ec4 100644
--- a/generator/restaurants_info/restaurants_info.pro
+++ b/generator/restaurants_info/restaurants_info.pro
@@ -18,6 +18,10 @@ INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src
 
 QT *= core
 
+macx-* {
+  LIBS *= "-framework IOKit" "-framework SystemConfiguration"
+}
+
 SOURCES += \
   restaurants_info.cpp \
 
diff --git a/generator/sponsored_dataset.hpp b/generator/sponsored_dataset.hpp
index a35ab8e803..82e26cbaa1 100644
--- a/generator/sponsored_dataset.hpp
+++ b/generator/sponsored_dataset.hpp
@@ -48,8 +48,11 @@ public:
   bool NecessaryMatchingConditionHolds(FeatureBuilder1 const & fb) const;
   ObjectId FindMatchingObjectId(FeatureBuilder1 const & e) const;
 
+  // Applies changes to a given osm object (for example, remove hotel type)
+  // and passes the result to |fn|.
   void PreprocessMatchedOsmObject(ObjectId matchedObjId, FeatureBuilder1 & fb,
                                   function<void(FeatureBuilder1 &)> const fn) const;
+  // Creates objects and adds them to the map (MWM) via |fn|.
   void BuildOsmObjects(function<void(FeatureBuilder1 &)> const & fn) const;
 
 protected:
diff --git a/tools/python/opentable_restaurants.py b/tools/python/opentable_restaurants.py
index 06f930a0d2..c0fd84d030 100755
--- a/tools/python/opentable_restaurants.py
+++ b/tools/python/opentable_restaurants.py
@@ -9,6 +9,7 @@ import copy
 import json
 import logging
 import os
+import re
 import sys
 import urllib2
 
@@ -83,6 +84,8 @@ def make_tsv(data_file, output_file):
         rest = json.loads(rest)
         try:
             address = ' '.join([rest['address'], rest['city'], rest['country']])
+            # Some addresses contain \t and maybe other spaces.
+            address = re.sub(r'\s', ' ', address)
         except TypeError:
             address = ''
         row = '\t'.join(map(unicode, [rest['rid'], rest['latitude'], rest['longitude'],