diff --git a/NEWS b/NEWS
index 2bba2293e8360f9f9664ef870742f0b8f620ae98..cf221bfe2c002aa519bf22ef565418a350f3f63d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,18 @@
+UNRELEASED (2015-03-??)
+
+    Fix a few more deprecation warnings concering instance variables
+    (i.e., add '@'s in ERB files) (adamhl)
+
 release/004.031 (2015-03-02)
 
     Beginning of work to support RHEL-ish operating systems
-    such as CentOS and Oracle Linux. The most common change 
+    such as CentOS and Oracle Linux. The most common change
     involves converting 'operatingsystem' variable/fact usage
-    to 'osfamily'. These changes were made safely as not to 
+    to 'osfamily'. These changes were made safely as not to
     potentially affect any existing hosts. There may be some
     additional refinements when CentOS and Oracle hosts come
     online; for now,  we're assuming they act identical to RHEL.
-    
+
     Additionally modified puppetclient.pp to support version
     locking of puppet and facter versions on RHEL systems.
     Added one additional manifest to facilitate this.
diff --git a/templates/kerberos/krb5.conf.erb b/templates/kerberos/krb5.conf.erb
index ac16a39847f4b6e6191d32629cec1bcab0893412..e6263187803dd36ffec70de1746032759bd4bc87 100644
--- a/templates/kerberos/krb5.conf.erb
+++ b/templates/kerberos/krb5.conf.erb
@@ -53,7 +53,7 @@
 
 [realms]
     stanford.edu = {
-<% if drSite == "yes" %>        kdc            = kerberos-liv.stanford.edu:88
+<% if @drSite == "yes" %>        kdc            = kerberos-liv.stanford.edu:88
 <% end %>        kdc            = krb5auth1.stanford.edu:88
         kdc            = krb5auth2.stanford.edu:88
         kdc            = krb5auth3.stanford.edu:88
diff --git a/templates/newsyslog/config.erb b/templates/newsyslog/config.erb
index 6dd5080749b5f5b5960927612e87c9fc4fcd5aa9..af82b2e4070debe30bca4d44b28a575f2e687882 100644
--- a/templates/newsyslog/config.erb
+++ b/templates/newsyslog/config.erb
@@ -5,7 +5,7 @@ set save    = <%= @directory %>/OLD/%n
 set archive = <%= @archive %>/%Y/%M/%d/%m.%n
 <% end -%>
 
-<%= name %> {
+<%= @name %> {
 <% if @stop != '' then -%>
     stop: <%= @stop %>
 <% end -%>
diff --git a/templates/os/motd.erb b/templates/os/motd.erb
index ba95197bce7af2e3cb9f962f85d0acff37fa8192..216d5d54cae8ade2c48a891e6a354a7e5339719c 100644
--- a/templates/os/motd.erb
+++ b/templates/os/motd.erb
@@ -10,7 +10,7 @@
 
     host = @fqdn.downcase
 
-    product = productname rescue nil
+    product = @productname rescue nil
     if product.nil?
       product = "unknown"
     else