diff --git a/mysql/manifests/init.pp b/mysql/manifests/init.pp
index 76ac2cd..c4cd9de 100644
--- a/mysql/manifests/init.pp
+++ b/mysql/manifests/init.pp
@@ -123,6 +123,7 @@ class mysql::server {
                 },
             }
         }
+        default: {}
     }
 
 }
diff --git a/nagios/manifests/target.pp b/nagios/manifests/target.pp
index 19a56c9..0b44cbd 100644
--- a/nagios/manifests/target.pp
+++ b/nagios/manifests/target.pp
@@ -505,9 +505,9 @@ class nagios::target::nrpe inherits nagios::target {
         nagios::target::nrpe::service { "check_linux_raid":
             description => "RAID",
             package     => $::operatingsystem ? {
-                "debian"  => "nagios-plugins-standard",
-                "ubuntu"  => "nagios-plugins-standard",
-                default   => "nagios-plugins-linux_raid",
+                "debian" => "nagios-plugins-standard",
+                "ubuntu" => "nagios-plugins-standard",
+                default  => "nagios-plugins-linux_raid",
             }
         }
     }
diff --git a/phantomjs/manifests/init.pp b/phantomjs/manifests/init.pp
index 347a207..46c97ed 100644
--- a/phantomjs/manifests/init.pp
+++ b/phantomjs/manifests/init.pp
@@ -5,15 +5,15 @@ class phantomjs {
     if !$phantomjs_package {
         case $::architecture {
             "amd64","x86_64": {
-                if $phantomjs64_package_latest {
-                    $phantomjs_package = $phantomjs64_package_latest
+                if $::phantomjs64_package_latest {
+                    $phantomjs_package = $::phantomjs64_package_latest
                 } else {
                     fail("Must define \$phantomjs_package or \$phantomjs64_package_latest")
                 }
             }
             default: {
-                if $phantomjs32_package_latest {
-                    $phantomjs_package = $phantomjs32_package_latest
+                if $::phantomjs32_package_latest {
+                    $phantomjs_package = $::phantomjs32_package_latest
                 } else {
                     fail("Must define \$phantomjs_package or \$phantomjs32_package_latest")
                 }
diff --git a/redis/manifests/init.pp b/redis/manifests/init.pp
index 666a643..591683b 100644
--- a/redis/manifests/init.pp
+++ b/redis/manifests/init.pp
@@ -31,9 +31,9 @@ class redis($bind="127.0.0.1", $datadir="", $password="", $appendonly=false) {
             require => Package["redis"],
         }
         file { "/srv/redis":
-            ensure  => link,
-            target  => $datadir,
-            before  => Service["redis"],
+            ensure => link,
+            target => $datadir,
+            before => Service["redis"],
         }
     } else {
         file { "/srv/redis":
diff --git a/teamspeak/manifests/init.pp b/teamspeak/manifests/init.pp
index b451877..318fa22 100644
--- a/teamspeak/manifests/init.pp
+++ b/teamspeak/manifests/init.pp
@@ -10,15 +10,15 @@ class teamspeak($package=undef, $license=undef) {
     if ! $package {
         case $::architecture {
             "amd64","x86_64": {
-                if $teamspeak64_package_latest {
-                    $teamspeak_package = $teamspeak64_package_latest
+                if $::teamspeak64_package_latest {
+                    $teamspeak_package = $::teamspeak64_package_latest
                 } else {
                     fail("Must define \$teamspeak_package or \$teamspeak64_package_latest")
                 }
             }
             default: {
-                if $teamspeak32_package_latest {
-                    $teamspeak_package = $teamspeak32_package_latest
+                if $::teamspeak32_package_latest {
+                    $teamspeak_package = $::teamspeak32_package_latest
                 } else {
                     fail("Must define \$teamspeak_package or \$teamspeak32_package_latest")
                 }