diff --git a/ChangeLog b/ChangeLog
index d3a294419..9df7f44ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-08  Badlop  <badlop@process-one.net>
 
+	* src/ejabberd_frontend_socket.erl: Fix compilation warnings and
+	add TODO comments.
+
 	* src/mod_irc/mod_irc_connection.erl: Fix compilation warnings.
 
 2009-04-08  Evgeniy Khramtsov <ekhramtsov@process-one.net>
diff --git a/src/ejabberd_frontend_socket.erl b/src/ejabberd_frontend_socket.erl
index 951ea713b..b0cdec71f 100644
--- a/src/ejabberd_frontend_socket.erl
+++ b/src/ejabberd_frontend_socket.erl
@@ -94,8 +94,9 @@ start(Module, SockMod, Socket, Opts) ->
 	    todo
     end.
 
-starttls(FsmRef, TLSOpts) ->
-    %gen_server:call(FsmRef, {starttls, TLSOpts}),
+starttls(FsmRef, _TLSOpts) ->
+    %% TODO: Frontend improvements planned by Aleksey
+    %%gen_server:call(FsmRef, {starttls, TLSOpts}),
     FsmRef.
 
 starttls(FsmRef, TLSOpts, Data) ->
@@ -137,8 +138,9 @@ close(FsmRef) ->
 sockname(FsmRef) ->
     gen_server:call(FsmRef, sockname).
 
-peername(FsmRef) ->
-    %gen_server:call(FsmRef, peername).
+peername(_FsmRef) ->
+    %% TODO: Frontend improvements planned by Aleksey
+    %%gen_server:call(FsmRef, peername).
     {ok, {{0, 0, 0, 0}, 0}}.