diff --git a/.gitmodules b/.gitmodules
index 651fce0..967585a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "td"]
 	path = td
-	url = https://github.com/tdlight-team/tdlight.git
+	url = https://git.ignuranza.net/tdlight-team/tdlight.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d34610..7df120f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ if (CLANG OR GCC)
   endif()
 endif()
 
-set(TG_HTTP_CLIENT_SOURCE
+set(TELEGRAM_BOT_API_SOURCE
   telegram-bot-api/telegram-bot-api.cpp
 
   telegram-bot-api/Client.cpp
@@ -70,7 +70,7 @@ set(TG_HTTP_CLIENT_SOURCE
   telegram-bot-api/WebhookActor.h
 )
 
-add_executable(telegram-bot-api ${TG_HTTP_CLIENT_SOURCE})
+add_executable(telegram-bot-api ${TELEGRAM_BOT_API_SOURCE})
 target_include_directories(telegram-bot-api PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 target_link_libraries(telegram-bot-api PRIVATE memprof tdactor tdcore tddb tdnet tdutils)
 
diff --git a/td b/td
index d71e2c5..6f28ad3 160000
--- a/td
+++ b/td
@@ -1 +1 @@
-Subproject commit d71e2c54a892b9ada7c52b463b24fdf2984fde60
+Subproject commit 6f28ad36af1435b6de46551b21278a3579c7e367
diff --git a/telegram-bot-api/Client.h b/telegram-bot-api/Client.h
index 174efca..9ccf10d 100644
--- a/telegram-bot-api/Client.h
+++ b/telegram-bot-api/Client.h
@@ -41,8 +41,6 @@ class Client : public WebhookActor::Callback {
   Client(td::ActorShared<> parent, const td::string &bot_token, bool is_test_dc, td::int64 tqueue_id,
          std::shared_ptr<const ClientParameters> parameters, td::ActorId<BotStatActor> stat_actor);
 
-  void start_up() override;
-
   void send(PromisedQueryPtr query) override;
 
   void close();
@@ -386,11 +384,11 @@ class Client : public WebhookActor::Callback {
 
   static td::Result<td::MutableSlice> get_required_string_arg(const Query *query, Slice field_name);
 
-  static int64 get_message_id(const Query *query, Slice field_name = "message_id");
+  static int64 get_message_id(const Query *query, Slice field_name = Slice("message_id"));
 
-  static td::Result<Slice> get_inline_message_id(const Query *query, Slice field_name = "inline_message_id");
+  static td::Result<Slice> get_inline_message_id(const Query *query, Slice field_name = Slice("inline_message_id"));
 
-  static td::Result<int32> get_user_id(const Query *query, Slice field_name = "user_id");
+  static td::Result<int32> get_user_id(const Query *query, Slice field_name = Slice("user_id"));
 
   int64 extract_yet_unsent_message_query_id(int64 chat_id, int64 message_id, bool *is_reply_to_message_deleted);
 
@@ -518,6 +516,8 @@ class Client : public WebhookActor::Callback {
 
   void long_poll_wakeup(bool force_flag);
 
+  void start_up() override;
+
   void raw_event(const td::Event::Raw &event) override;
 
   void loop() override;