diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php
index 0788e20884..bfa7500064 100644
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -392,9 +392,7 @@ class BillRepository implements BillRepositoryInterface
      * @param Carbon $date
      *
      * @return \Carbon\Carbon
-     *
-     * @throws \FireflyIII\Support\Facades\FireflyException
-     * @throws \FireflyIII\Support\Facades\FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function nextDateMatch(Bill $bill, Carbon $date): Carbon
     {
@@ -432,10 +430,6 @@ class BillRepository implements BillRepositoryInterface
      * @param Carbon $date
      *
      * @return Carbon
-     *
-     * @throws \FireflyIII\Support\Facades\FireflyException
-     * @throws \FireflyIII\Support\Facades\FireflyException
-     * @throws \FireflyIII\Support\Facades\FireflyException
      */
     public function nextExpectedMatch(Bill $bill, Carbon $date): Carbon
     {
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index 04ce257ebb..3ac57bc625 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -288,7 +288,6 @@ class ExpandedForm
      * @return string
      *
      * @throws \Throwable
-     * @throws Facades\FireflyException
      */
     public function nonSelectableAmount(string $name, $value = null, array $options = []): string
     {
@@ -319,7 +318,6 @@ class ExpandedForm
      * @return string
      *
      * @throws \Throwable
-     * @throws Facades\FireflyException
      */
     public function nonSelectableBalance(string $name, $value = null, array $options = []): string
     {
diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index 29c569d26f..a7729c05a6 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -38,7 +38,7 @@ class Navigation
      *
      * @return \Carbon\Carbon
      *
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function addPeriod(Carbon $theDate, string $repeatFreq, int $skip): Carbon
     {
@@ -86,7 +86,7 @@ class Navigation
      * @param string         $range
      *
      * @return array
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function blockPeriods(\Carbon\Carbon $start, \Carbon\Carbon $end, string $range): array
     {
@@ -148,7 +148,7 @@ class Navigation
      *
      * @return \Carbon\Carbon
      *
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function endOfPeriod(\Carbon\Carbon $end, string $repeatFreq): Carbon
     {
@@ -211,7 +211,7 @@ class Navigation
      * @param string              $repeatFreq
      * @param \Carbon\Carbon|null $maxDate
      *
-     * @return Carbon
+     * @return \Carbon\Carbon
      */
     public function endOfX(Carbon $theCurrentEnd, string $repeatFreq, ?Carbon $maxDate): Carbon
     {
@@ -285,11 +285,11 @@ class Navigation
 
     /**
      * @param \Carbon\Carbon $theDate
-     * @param                $repeatFrequency
+     * @param  string              $repeatFrequency
      *
      * @return string
      *
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function periodShow(Carbon $theDate, string $repeatFrequency): string
     {
@@ -444,7 +444,7 @@ class Navigation
      *
      * @return \Carbon\Carbon
      *
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon
     {
@@ -496,7 +496,7 @@ class Navigation
      *
      * @return \Carbon\Carbon
      *
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function subtractPeriod(Carbon $theDate, string $repeatFreq, int $subtract = 1): Carbon
     {
@@ -565,7 +565,7 @@ class Navigation
      *
      * @return \Carbon\Carbon
      *
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function updateEndDate(string $range, Carbon $start): Carbon
     {
@@ -604,7 +604,7 @@ class Navigation
      *
      * @return \Carbon\Carbon
      *
-     * @throws FireflyException
+     * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function updateStartDate(string $range, Carbon $start): Carbon
     {