diff --git a/refpolicy/policy/modules/kernel/devices.if b/refpolicy/policy/modules/kernel/devices.if
index 08b43f0..c1b5862 100644
--- a/refpolicy/policy/modules/kernel/devices.if
+++ b/refpolicy/policy/modules/kernel/devices.if
@@ -510,9 +510,8 @@ interface(`dev_create_dev_node',`
 	allow $1 device_t:dir rw_dir_perms;
 	type_transition $1 device_t:$3 $2;
 
-	optional_policy(`distro_redhat',`
-		fs_associate_tmpfs($2)
-	')
+	fs_associate_tmpfs($2)
+	files_associate_tmp($2)
 ')
 
 ########################################
diff --git a/refpolicy/policy/modules/system/logging.te b/refpolicy/policy/modules/system/logging.te
index 8cff50b..e7869a5 100644
--- a/refpolicy/policy/modules/system/logging.te
+++ b/refpolicy/policy/modules/system/logging.te
@@ -50,9 +50,8 @@ files_tmp_file(syslogd_tmp_t)
 type syslogd_var_run_t;
 files_pid_file(syslogd_var_run_t)
 
-type var_log_t, logfile;
-files_type(var_log_t)
-files_associate_tmp(var_log_t)
+type var_log_t;
+logging_log_file(var_log_t)
 
 ########################################
 #