@@ -112,22 +112,22 @@
 + (instancetype)mapTableWithKeyFunctions: (of_map_table_functions_t)keyFunctions
 			 objectFunctions: (of_map_table_functions_t)
 					      objectFunctions
 				capacity: (size_t)capacity;
 
-- init OF_UNAVAILABLE;
+- (instancetype)init OF_UNAVAILABLE;
 
 /*!
  * @brief Initializes an already allocated OFMapTable with the specified key
  *	  and object functions.
  *
  * @param keyFunctions A structure of functions for handling keys
  * @param objectFunctions A structure of functions for handling objects
  * @return An initialized OFMapTable
  */
-- initWithKeyFunctions: (of_map_table_functions_t)keyFunctions
-       objectFunctions: (of_map_table_functions_t)objectFunctions;
+- (instancetype)initWithKeyFunctions: (of_map_table_functions_t)keyFunctions
+		     objectFunctions: (of_map_table_functions_t)objectFunctions;
 
 /*!
  * @brief Initializes an already allocated OFMapTable with the specified key
  *	  functions, object functions and capacity.
  *
@@ -135,13 +135,14 @@
  * @param objectFunctions A structure of functions for handling objects
  * @param capacity A hint about the count of elements expected to be in the map
  *	  table
  * @return An initialized OFMapTable
  */
-- initWithKeyFunctions: (of_map_table_functions_t)keyFunctions
-       objectFunctions: (of_map_table_functions_t)objectFunctions
-	      capacity: (size_t)capacity OF_DESIGNATED_INITIALIZER;
+- (instancetype)initWithKeyFunctions: (of_map_table_functions_t)keyFunctions
+		     objectFunctions: (of_map_table_functions_t)objectFunctions
+			    capacity: (size_t)capacity
+    OF_DESIGNATED_INITIALIZER;
 
 /*!
  * @brief Returns the number of objects in the map table.
  *
  * @return The number of objects in the map table
@@ -244,11 +245,11 @@
 	unsigned long _mutations;
 	unsigned long *_Nullable _mutationsPtr;
 	uint32_t _position;
 }
 
-- init OF_UNAVAILABLE;
+- (instancetype)init OF_UNAVAILABLE;
 
 /*!
  * @brief Returns a pointer to the next object, or NULL if the enumeration
  *	  finished.
  *