diff --git a/bindings/python/src/session_settings.cpp b/bindings/python/src/session_settings.cpp
index 6866b43fe..309a21a14 100644
--- a/bindings/python/src/session_settings.cpp
+++ b/bindings/python/src/session_settings.cpp
@@ -37,7 +37,7 @@ void bind_session_settings()
         .def_readwrite("lazy_bitfields", &session_settings::lazy_bitfields)
         .def_readwrite("inactivity_timeout", &session_settings::inactivity_timeout)
         .def_readwrite("unchoke_interval", &session_settings::unchoke_interval)
-        .def_readwrite("optimistic_unchoke_multiplier", &session_settings::optimistic_unchoke_multiplier)
+        .def_readwrite("optimistic_unchoke_interval", &session_settings::optimistic_unchoke_interval)
         .def_readwrite("num_want", &session_settings::num_want)
         .def_readwrite("initial_picker_threshold", &session_settings::initial_picker_threshold)
         .def_readwrite("allowed_fast_set_size", &session_settings::allowed_fast_set_size)
@@ -59,13 +59,13 @@ void bind_session_settings()
         .def_readwrite("disk_io_write_mode", &session_settings::disk_io_write_mode)
         .def_readwrite("disk_io_read_mode", &session_settings::disk_io_read_mode)
         .def_readwrite("coalesce_reads", &session_settings::coalesce_reads)
-        .def_readwrite("coalesce_writes", &session_settings:coalesce_writes)
+        .def_readwrite("coalesce_writes", &session_settings::coalesce_writes)
         .def_readwrite("outgoing_ports", &session_settings::outgoing_ports)
         .def_readwrite("peer_tos", &session_settings::peer_tos)
         .def_readwrite("active_downloads", &session_settings::active_downloads)
         .def_readwrite("active_seeds", &session_settings::active_seeds)
         .def_readwrite("active_limit", &session_settings::active_limit)
-        .def_readwrite("auto_manage_prefer_seeds", &session_settings::automanaged_prefer_seeds)
+        .def_readwrite("auto_manage_prefer_seeds", &session_settings::auto_manage_prefer_seeds)
         .def_readwrite("dont_count_slow_torrents", &session_settings::dont_count_slow_torrents)
         .def_readwrite("auto_manage_interval", &session_settings::auto_manage_interval)
         .def_readwrite("share_ratio_limit", &session_settings::share_ratio_limit)
@@ -109,15 +109,15 @@ void bind_session_settings()
         .value("http_pw", proxy_settings::http_pw)
     ;
     
-    enum_<session_settings::disk_cache_algo_t("disk_cache_algo_t")
-        .value("lru", session_settings::disk_cache_algo_t::lru)
-        .value("largest_contiguous", session_settings::disk_cache_algo_t::largest_contiguous)
+    enum_<session_settings::disk_cache_algo_t>("disk_cache_algo_t")
+        .value("lru", session_settings::lru)
+        .value("largest_contiguous", session_settings::largest_contiguous)
     ;
     
-    enum_<session_settings::io_buffer_mode_t("io_buffer_mode_t")
-        .value("enable_os_cache", session_settings::io_buffer_mode_t::enable_os_cache)
-        .value("disable_os_cache_for_aligned_files", session_settings::io_buffer_mode_t:disable_os_cache_for_aligned_files)
-        .value("disable_os_cache", session_settings::io_buffer_mode_t::disable_os_cache)
+    enum_<session_settings::io_buffer_mode_t>("io_buffer_mode_t")
+        .value("enable_os_cache", session_settings::enable_os_cache)
+        .value("disable_os_cache_for_aligned_files", session_settings::disable_os_cache_for_aligned_files)
+        .value("disable_os_cache", session_settings::disable_os_cache)
     ;
      
     class_<proxy_settings>("proxy_settings")
diff --git a/include/libtorrent/session_settings.hpp b/include/libtorrent/session_settings.hpp
index 71a6cc2ce..63eef5a8e 100644
--- a/include/libtorrent/session_settings.hpp
+++ b/include/libtorrent/session_settings.hpp
@@ -413,8 +413,8 @@ namespace libtorrent
 			disable_os_cache_for_aligned_files = 1,
 			disable_os_cache = 2
 		};
-		int disk_io_write_mode:4;
-		int disk_io_read_mode:4;
+		int disk_io_write_mode;
+		int disk_io_read_mode;
 
 		bool coalesce_reads;
 		bool coalesce_writes;