diff --git a/.gitignore b/.gitignore
index 59eb731..0e644bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ Gemfile.lock
 files/packages/
 graphs/
 metadata.json
+.project
diff --git a/.project b/.project
deleted file mode 100644
index 6ff122e..0000000
--- a/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>puppet-riak</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/manifests/appconfig.pp b/manifests/appconfig.pp
index 0bc19bb..6268be3 100644
--- a/manifests/appconfig.pp
+++ b/manifests/appconfig.pp
@@ -134,16 +134,18 @@
     default => $source,
   }
 
-  anchor { 'riak::appconfig::start': } ->
+  anchor { 'riak::appconfig::start': }
 
   file { [
       $appcfg[riak_core][platform_log_dir],
       $appcfg[riak_core][platform_lib_dir],
       $appcfg[riak_core][platform_data_dir],
     ]:
-    ensure => directory,
-    mode   => '0755',
-    owner  => 'riak',
+    ensure  => directory,
+    mode    => '0755',
+    owner   => 'riak',
+    require => Anchor['riak::appconfig::start'],
+    before  => Anchor['riak::appconfig::end'],
   }
 
   file { "${$appcfg[riak_core][platform_etc_dir]}/app.config":
@@ -154,15 +156,10 @@
       File["${$appcfg[riak_core][platform_log_dir]}"],
       File["${$appcfg[riak_core][platform_lib_dir]}"],
       File["${$appcfg[riak_core][platform_data_dir]}"],
+      Anchor['riak::appconfig::start'],
     ],
+    before  => Anchor['riak::appconfig::end'],
   }
 
-  anchor { 'riak::appconfig::end':
-    require => [
-      File["${$appcfg[riak_core][platform_etc_dir]}/app.config"],
-      File["${$appcfg[riak_core][platform_log_dir]}"],
-      File["${$appcfg[riak_core][platform_lib_dir]}"],
-      File["${$appcfg[riak_core][platform_data_dir]}"],
-    ],
-  }
+  anchor { 'riak::appconfig::end': }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index d464863..c685211 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -143,7 +143,7 @@
   }
 
   if $use_repos == true {
-    package { 'riak':
+    package { $package:
       ensure  => $manage_package,
       require => [
         Class[riak::config],
diff --git a/manifests/vmargs.pp b/manifests/vmargs.pp
index 361f9da..4939277 100644
--- a/manifests/vmargs.pp
+++ b/manifests/vmargs.pp
@@ -47,13 +47,15 @@
     default => $source,
   }
 
-  anchor { 'riak::vmargs::start': } ->
+  anchor { 'riak::vmargs::start': }
 
   file { '/etc/riak/vm.args':
     ensure  => $manage_file,
     content => $manage_template,
     source  => $manage_source,
-  } ->
+    require => Anchor['riak::vmargs::start'],
+    before  => Anchor['riak::vmargs::end'],
+  }
 
   anchor { 'riak::vmargs::end': }
 }