diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 1288ce4ad4a5323db02c7e0cb2906574979a1ac3..1d438e23bd674e4547f0344564c0ec3b9fe273e3 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -5490,16 +5490,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/rte_ckeditor/Classes/Form/Resolver/RichTextNodeResolver.php
 
-		-
-			message: "#^Parameter \\#2 \\$interval of method TYPO3\\\\CMS\\\\Scheduler\\\\Task\\\\AbstractTask\\:\\:registerRecurringExecution\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: ../../typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
-
-		-
-			message: "#^Parameter \\#2 \\$task of method TYPO3\\\\CMS\\\\Scheduler\\\\AdditionalFieldProviderInterface\\:\\:getAdditionalFields\\(\\) expects TYPO3\\\\CMS\\\\Scheduler\\\\Task\\\\AbstractTask, null given\\.$#"
-			count: 1
-			path: ../../typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
-
 		-
 			message: "#^Comparison operation \"\\<\" between int\\<1, max\\> and 1 is always false\\.$#"
 			count: 1
@@ -5520,16 +5510,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/scheduler/Classes/Scheduler.php
 
-		-
-			message: "#^Parameter \\#1 \\$interval of method TYPO3\\\\CMS\\\\Scheduler\\\\Execution\\:\\:setInterval\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: ../../typo3/sysext/scheduler/Classes/Task/AbstractTask.php
-
-		-
-			message: "#^Parameter \\#1 \\$multiple of method TYPO3\\\\CMS\\\\Scheduler\\\\Execution\\:\\:setMultiple\\(\\) expects bool, int given\\.$#"
-			count: 1
-			path: ../../typo3/sysext/scheduler/Classes/Task/AbstractTask.php
-
 		-
 			message: "#^If condition is always true\\.$#"
 			count: 1
diff --git a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
index b0430312e8a3fcaa924110886694e9748df4e367..e65ac7ff4cafc3f74e9b55d7d4401d755faf19b0 100644
--- a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
+++ b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
@@ -27,7 +27,7 @@ interface AdditionalFieldProviderInterface
      * Gets additional fields to render in the form to add/edit a task
      *
      * @param array $taskInfo Values of the fields from the add/edit task form
-     * @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task The task object being edited. Null when adding a task!
+     * @param \TYPO3\CMS\Scheduler\Task\AbstractTask|null $task The task object being edited. Null when adding a task!
      * @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
      * @return array A two dimensional array: array('fieldId' => array('code' => '', 'label' => '', 'cshKey' => '', 'cshLabel' => ''))
      */
diff --git a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
index 3f036573f99ef370931588c170d93d601465f65c..d31405532c99d043025d4be5bdcca68fa8326a47 100644
--- a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
@@ -312,7 +312,7 @@ abstract class AbstractTask implements LoggerAwareInterface
         $execution->setInterval(0);
         $execution->setEnd($timestamp);
         $execution->setCronCmd('');
-        $execution->setMultiple(0);
+        $execution->setMultiple(false);
         $execution->setIsNewSingleExecution(true);
         // Replace existing execution object
         $this->execution = $execution;
@@ -322,7 +322,7 @@ abstract class AbstractTask implements LoggerAwareInterface
      * Registers a recurring execution of the task
      *
      * @param int $start The first date/time where this execution should occur (timestamp)
-     * @param string $interval Execution interval in seconds
+     * @param int $interval Execution interval in seconds
      * @param int $end The last date/time where this execution should occur (timestamp)
      * @param bool $multiple Set to FALSE if multiple executions of this task are not permitted in parallel
      * @param string $cron_cmd Used like in crontab (minute hour day month weekday)