diff --git a/Localization/L11nManager.php b/Localization/L11nManager.php
index 7a19dfdcd..a36495d6a 100644
--- a/Localization/L11nManager.php
+++ b/Localization/L11nManager.php
@@ -250,9 +250,6 @@ final class L11nManager
      *
      * @return string
      *
-     * @todo Orange-Management/phpOMS#247
-     *  [L11nManager] Create currency rendering test for million and billion dividers
-     *
      * @since 1.0.0
      */
     public function getCurrency(Localization $l11n, $currency, string $format = null, string $symbol = null, int $divide = 1) : string
@@ -276,15 +273,15 @@ final class L11nManager
     /**
      * Print a datetime
      *
-     * @param Localization   $l11n     Localization
-     * @param null|\DateTime $datetime DateTime to print
-     * @param string         $format   Format type to use
+     * @param Localization            $l11n     Localization
+     * @param null|\DateTimeInterface $datetime DateTime to print
+     * @param string                  $format   Format type to use
      *
      * @return string
      *
      * @since 1.0.0
      */
-    public function getDateTime(Localization $l11n, \DateTime $datetime = null, string $format = null) : string
+    public function getDateTime(Localization $l11n, \DateTimeInterface $datetime = null, string $format = null) : string
     {
         return $datetime === null ? '' : $datetime->format($l11n->getDateTime()[$format ?? 'medium']);
     }
diff --git a/Utils/Converter/FileSizeType.php b/Utils/Converter/FileSizeType.php
index 90c8c707d..ad186e915 100644
--- a/Utils/Converter/FileSizeType.php
+++ b/Utils/Converter/FileSizeType.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace phpOMS\Utils\Converter;
 
 use phpOMS\Stdlib\Base\Enum;
-use phpOMS\Utils\Converter\Measurement;
 
 /**
  * File size type enum.
@@ -61,11 +60,11 @@ abstract class FileSizeType extends Enum
         if ($size < 300) {
             return [$size, 'B'];
         } elseif ($size < 1000) {
-            return [Measurement::convertFileSize($size, FileSizeType::BYTE, FileSizeType::KILOBYTE), 'KB'];
+            return [Measurement::convertFileSize($size, self::BYTE, self::KILOBYTE), 'KB'];
         } elseif ($size < 1000 * 1000 * 1000) {
-            return [Measurement::convertFileSize($size, FileSizeType::BYTE, FileSizeType::MEGABYTE), 'MB'];
+            return [Measurement::convertFileSize($size, self::BYTE, self::MEGABYTE), 'MB'];
         }
 
-        return [Measurement::convertFileSize($size, FileSizeType::BYTE, FileSizeType::GIGABYTE), 'GB'];
+        return [Measurement::convertFileSize($size, self::BYTE, self::GIGABYTE), 'GB'];
     }
 }
diff --git a/Views/View.php b/Views/View.php
index e70f41baa..3e961124d 100644
--- a/Views/View.php
+++ b/Views/View.php
@@ -344,14 +344,14 @@ class View extends ViewAbstract
     /**
      * Print a datetime
      *
-     * @param null|\DateTime $datetime DateTime to print
-     * @param string         $format   Format type to use
+     * @param null|\DateTimeInterface $datetime DateTime to print
+     * @param string                  $format   Format type to use
      *
      * @return string
      *
      * @since 1.0.0
      */
-    public function getDateTime(\DateTime $datetime = null, string $format = null) : string
+    public function getDateTime(\DateTimeInterface $datetime = null, string $format = null) : string
     {
         return $this->l11nManager->getDateTime($this->l11n, $datetime, $format);
     }