diff --git a/manifests/client.pp b/manifests/client.pp
index f065f470..9df2c27e 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -4,10 +4,10 @@
   Optional[String] $shortname                        = $title,
   Optional[String] $ip                               = undef,
   Optional[String] $ip6                              = undef,
-  Enum['*', 'udp', 'tcp'] $proto                     = '*',
+  Optional[Enum['*', 'udp', 'tcp']] $proto           = '*',
   Freeradius::Boolean $require_message_authenticator = 'no',
   Optional[String] $virtual_server                   = undef,
-  Enum['cisco', 'computone', 'livingston', 'juniper', 'max40xx', 'multitech', 'netserver', 'pathras', 'patton', 'portslave', 'tc', 'usrhiper', 'other'] $nastype = undef,
+  Optional[Enum['cisco', 'computone', 'livingston', 'juniper', 'max40xx', 'multitech', 'netserver', 'pathras', 'patton', 'portslave', 'tc', 'usrhiper', 'other']] $nastype = undef,
   Optional[String] $login                            = undef,
   Optional[String] $password                         = undef,
   Optional[String] $coa_server                       = undef,
@@ -20,8 +20,8 @@
   Optional[String] $srcip                            = undef,
   Boolean $firewall                                  = false,
   Freeradius::Ensure $ensure                         = present,
-  Array $attributes                    = [],
-  Optional[String] $huntgroups                    = undef,
+  Variant[Array, Hash, String] $attributes           = [],
+  Optional[String] $huntgroups                       = undef,
 ) {
   $fr_package  = $::freeradius::params::fr_package
   $fr_service  = $::freeradius::params::fr_service
diff --git a/manifests/home_server_pool.pp b/manifests/home_server_pool.pp
index 64481ad0..8714c33a 100644
--- a/manifests/home_server_pool.pp
+++ b/manifests/home_server_pool.pp
@@ -1,6 +1,6 @@
 # Configure home server pools
 define freeradius::home_server_pool (
-  String $home_server,
+  Variant[String, Array[String]] $home_server,
   Enum['fail-over', 'load-balance', 'client-balance', 'client-port-balance', 'keyed-balance'] $type = 'fail-over',
   Optional[String] $virtual_server = undef,
   Optional[String] $fallback       = undef,
diff --git a/manifests/huntgroup.pp b/manifests/huntgroup.pp
index 192c95ea..e137c11e 100644
--- a/manifests/huntgroup.pp
+++ b/manifests/huntgroup.pp
@@ -1,9 +1,9 @@
 # Install FreeRADIUS huntgroups
 define freeradius::huntgroup (
-  Freeradius::Ensure $ensure          = present,
-  Optional[String] $huntgroup         = $title,
-  Optional[Array[String]] $conditions = [],
-  Optional[Integer] $order            = 50,
+  Freeradius::Ensure $ensure                = present,
+  Optional[String] $huntgroup               = $title,
+  Optional[Array[String]] $conditions       = [],
+  Optional[Variant[String, Integer]] $order = 50,
 ) {
   $fr_basepath = $::freeradius::params::fr_basepath
   $fr_service  = $::freeradius::params::fr_service
diff --git a/manifests/listen.pp b/manifests/listen.pp
index 1302f886..44fbc3b8 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -6,7 +6,7 @@
   Optional[String] $ip                                      = undef,
   Optional[String] $ip6                                     = undef,
   Integer $port                                             = 0,
-  String $interface                                         = undef,
+  Optional[String] $interface                               = undef,
   Array[String] $clients                                    = [],
   Integer $max_connections                                  = 16,
   Integer $lifetime                                         = 0,
diff --git a/manifests/sql.pp b/manifests/sql.pp
index 2c4446fd..e61be784 100644
--- a/manifests/sql.pp
+++ b/manifests/sql.pp
@@ -31,7 +31,7 @@
   Optional[Integer] $pool_min                    = 1,
   Optional[Integer] $pool_spare                  = 1,
   Optional[Integer] $pool_idle_timeout           = 60,
-  Optional[Float] $pool_connect_timeout          = '3.0',
+  Optional[Float] $pool_connect_timeout          = 3.0,
 ) {
   $fr_package          = $::freeradius::params::fr_package
   $fr_service          = $::freeradius::params::fr_service