diff --git a/examples/F90/bufr_read_tropical_cyclone.f90 b/examples/F90/bufr_read_tropical_cyclone.f90
index a8c1ba0d5..b2b1ee512 100644
--- a/examples/F90/bufr_read_tropical_cyclone.f90
+++ b/examples/F90/bufr_read_tropical_cyclone.f90
@@ -11,7 +11,11 @@
 !
 ! Description: how to read data for a tropical cyclone BUFR message.
 !
-
+! Please note that tropical cyclone tracks can be encoded in various ways in BUFR.
+! Therefore the code below might not work directly for other types of messages
+! than the one used in the example. It is advised to use bufr_dump to
+! understand the structure of the messages.
+!
 program bufr_read_tropical_cyclone
   use eccodes
   implicit none
diff --git a/examples/python/bufr_expanded.py b/examples/python/bufr_expanded.py
index 3b3df93ee..a012e6db6 100644
--- a/examples/python/bufr_expanded.py
+++ b/examples/python/bufr_expanded.py
@@ -12,7 +12,6 @@
 #
 # Description: how to read values of different type of keys from BUFR messages.
 #
-#
 
 from __future__ import absolute_import
 from __future__ import print_function
diff --git a/examples/python/bufr_keys_iterator.py b/examples/python/bufr_keys_iterator.py
index dbc48e6b3..f4a4eecfd 100644
--- a/examples/python/bufr_keys_iterator.py
+++ b/examples/python/bufr_keys_iterator.py
@@ -11,8 +11,8 @@
 # Python implementation: bufr_keys_iterator
 #
 # Description: Example on how to use keys_iterator functions and the
-#           codes_bufr_keys_iterator structure to get all the available
-#           keys in a BUFR message.
+#              codes_bufr_keys_iterator structure to get all the available
+#              keys in a BUFR message.
 
 
 from __future__ import print_function
diff --git a/examples/python/bufr_read_tropical_cyclone.py b/examples/python/bufr_read_tropical_cyclone.py
index 7fe8aabcb..42031638d 100644
--- a/examples/python/bufr_read_tropical_cyclone.py
+++ b/examples/python/bufr_read_tropical_cyclone.py
@@ -10,6 +10,11 @@
 #
 # Description: how to read data of the ECMWF EPS tropical cyclone tracks encoded in BUFR format.
 #
+# Please note that tropical cyclone tracks can be encoded in various ways in BUFR.
+# Therefore the code below might not work directly for other types of messages
+# than the one used in the example. It is advised to use bufr_dump to
+# understand the structure of the messages.
+#
 
 from __future__ import print_function
 import traceback