diff --git a/lib/plugins/Invoke-IcingaCheckCPU.psm1 b/lib/plugins/Invoke-IcingaCheckCPU.psm1
index f3b3d49..6f0d968 100644
--- a/lib/plugins/Invoke-IcingaCheckCPU.psm1
+++ b/lib/plugins/Invoke-IcingaCheckCPU.psm1
@@ -38,8 +38,8 @@ Import-IcingaLib icinga\plugin;
 function Invoke-IcingaCheckCPU()
 {
     param(
-        [int]$Warning       = $null,
-        [int]$Critical      = $null,
+        $Warning            = $null,
+        $Critical           = $null,
         [string]$Core       = '*',
         [switch]$NoPerfData,
         [ValidateSet(0, 1, 2, 3)]
diff --git a/lib/plugins/Invoke-IcingaCheckDirectory.psm1 b/lib/plugins/Invoke-IcingaCheckDirectory.psm1
index d901f7b..c20ecba 100644
--- a/lib/plugins/Invoke-IcingaCheckDirectory.psm1
+++ b/lib/plugins/Invoke-IcingaCheckDirectory.psm1
@@ -62,8 +62,8 @@ function Invoke-IcingaCheckDirectory()
       [string]$Path,
       [array]$FileNames,
       [switch]$Recurse,
-      [int]$Critical      = $null,
-      [int]$Warning       = $null,
+      $Critical           = $null,
+      $Warning            = $null,
       [string]$YoungerThen,
       [string]$OlderThen,
       [ValidateSet(0, 1, 2, 3)]
diff --git a/lib/plugins/Invoke-IcingaCheckEventlog.psm1 b/lib/plugins/Invoke-IcingaCheckEventlog.psm1
index a62847f..4e92802 100644
--- a/lib/plugins/Invoke-IcingaCheckEventlog.psm1
+++ b/lib/plugins/Invoke-IcingaCheckEventlog.psm1
@@ -14,8 +14,8 @@ function Invoke-IcingaCheckEventlog()
         [array]$ExcludeEntryType,
         [array]$IncludeMessage,
         [array]$ExcludeMessage,
-        $After = $null,
-        $Before = $null,
+        $After                    = $null,
+        $Before                   = $null,
         [switch]$DisableTimeCache = $FALSE,
         [switch]$NoPerfData,
         [ValidateSet(0, 1, 2, 3)]
diff --git a/lib/plugins/Invoke-IcingaCheckPerfcounter.psm1 b/lib/plugins/Invoke-IcingaCheckPerfcounter.psm1
index b10df7e..c9b0588 100644
--- a/lib/plugins/Invoke-IcingaCheckPerfcounter.psm1
+++ b/lib/plugins/Invoke-IcingaCheckPerfcounter.psm1
@@ -4,8 +4,8 @@ function Invoke-IcingaCheckPerfcounter()
 {
     param(
         [array]$PerfCounter,
-        [double]$Warning     = $null,
-        [double]$Critical    = $null,
+        $Warning             = $null,
+        $Critical            = $null,
         [switch]$NoPerfData,
         [ValidateSet(0, 1, 2, 3)]
         [int]$Verbosity      = 0
diff --git a/lib/plugins/Invoke-IcingaCheckProcessCount.psm1 b/lib/plugins/Invoke-IcingaCheckProcessCount.psm1
index a40c6e2..7487371 100644
--- a/lib/plugins/Invoke-IcingaCheckProcessCount.psm1
+++ b/lib/plugins/Invoke-IcingaCheckProcessCount.psm1
@@ -40,8 +40,8 @@ Import-IcingaLib icinga\plugin;
 function Invoke-IcingaCheckProcessCount()
 {
    param(
-      [int]$Warning       = $null,
-      [int]$Critical      = $null,
+      $Warning            = $null,
+      $Critical           = $null,
       [array]$Process,
       [switch]$NoPerfData,
       [ValidateSet(0, 1, 2, 3)]
diff --git a/lib/plugins/Invoke-IcingaCheckUpdates.psm1 b/lib/plugins/Invoke-IcingaCheckUpdates.psm1
index 4443e35..33d81a5 100644
--- a/lib/plugins/Invoke-IcingaCheckUpdates.psm1
+++ b/lib/plugins/Invoke-IcingaCheckUpdates.psm1
@@ -33,11 +33,11 @@ function Invoke-IcingaCheckUpdates()
 {
     param (
         [array]$UpdateFilter,
-        [int]$Warning         = $null,
-        [int]$Critical        = $null,
+        $Warning             = $null,
+        $Critical            = $null,
         [switch]$NoPerfData,
         [ValidateSet(0, 1, 2, 3)]
-        [int]$Verbosity       = 0
+        [int]$Verbosity      = 0
     );
 
     $PendingUpdates = Get-IcingaUpdatesPending;
diff --git a/lib/plugins/Invoke-IcingaCheckUsedPartitionSpace.psm1 b/lib/plugins/Invoke-IcingaCheckUsedPartitionSpace.psm1
index bfb3ca3..95aa13f 100644
--- a/lib/plugins/Invoke-IcingaCheckUsedPartitionSpace.psm1
+++ b/lib/plugins/Invoke-IcingaCheckUsedPartitionSpace.psm1
@@ -45,8 +45,8 @@ Import-IcingaLib icinga\plugin;
 function Invoke-IcingaCheckUsedPartitionSpace()
 {
    param(
-      [int]$Warning       = $null,
-      [int]$Critical      = $null,
+      $Warning            = $null,
+      $Critical           = $null,
       [array]$Include     = @(),
       [array]$Exclude     = @(),
       [switch]$NoPerfData,
diff --git a/lib/plugins/Invoke-IcingaCheckUsers.psm1 b/lib/plugins/Invoke-IcingaCheckUsers.psm1
index 4a13833..20ca89b 100644
--- a/lib/plugins/Invoke-IcingaCheckUsers.psm1
+++ b/lib/plugins/Invoke-IcingaCheckUsers.psm1
@@ -37,8 +37,8 @@ function Invoke-IcingaCheckUsers()
 {
     param (
         [array]$Username,
-        [int]$Warning        = $null,
-        [int]$Critical       = $null,
+        $Warning             = $null,
+        $Critical            = $null,
         [switch]$NoPerfData,
         [ValidateSet(0, 1, 2, 3)]
         [int]$Verbosity      = 0