@@ -25,21 +25,21 @@
  */
 @interface OFMutableURL: OFURL
 /*!
  * The scheme part of the URL.
  */
-@property (readwrite, copy, nonatomic) OFString *scheme;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *scheme;
 
 /*!
  * The host part of the URL.
  */
-@property (readwrite, copy, nonatomic) OFString *host;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *host;
 
 /*!
  * The port part of the URL.
  */
-@property (readwrite, nonatomic) uint16_t port;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFNumber *port;
 
 /*!
  * The user part of the URL.
  */
 @property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *user;
@@ -50,11 +50,11 @@
 @property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *password;
 
 /*!
  * The path part of the URL.
  */
-@property (readwrite, copy, nonatomic) OFString *path;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *path;
 
 /*!
  * The parameters part of the URL.
  */
 @property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)