diff --git a/src/main/java/net/coderbot/iris/shaderpack/ShaderProperties.java b/src/main/java/net/coderbot/iris/shaderpack/ShaderProperties.java
index 32bb6eddf8..2d7f220599 100644
--- a/src/main/java/net/coderbot/iris/shaderpack/ShaderProperties.java
+++ b/src/main/java/net/coderbot/iris/shaderpack/ShaderProperties.java
@@ -113,7 +113,7 @@ private ShaderProperties() {
 	// TODO: Is there a better solution than having ShaderPack pass a root path to ShaderProperties to be able to read textures?
 	public ShaderProperties(String contents, ShaderPackOptions shaderPackOptions, Iterable<StringPair> environmentDefines, Iterable<StringPair> replacements) {
 		for (StringPair pair : replacements) {
-			contents = contents.replace(pair.getKey(), pair.getValue());
+			contents = contents.replaceAll("\\b" + pair.getKey() + "\\b", pair.getValue());
 		}
 
 		String preprocessedContents = PropertiesPreprocessor.preprocessSource(contents, shaderPackOptions, environmentDefines);
diff --git a/src/main/java/net/coderbot/iris/uniforms/custom/CustomUniforms.java b/src/main/java/net/coderbot/iris/uniforms/custom/CustomUniforms.java
index f0feb91279..c898f352a5 100644
--- a/src/main/java/net/coderbot/iris/uniforms/custom/CustomUniforms.java
+++ b/src/main/java/net/coderbot/iris/uniforms/custom/CustomUniforms.java
@@ -306,7 +306,7 @@ public void addVariable(String type, String name, String expression, boolean isU
 				ExpressionElement ast = Parser.parse(expression, IrisOptions.options);
 				variables.put(name, new Variable(parsedType, name, ast, isUniform));
 			} catch (Exception e) {
-				Iris.logger.warn("Failed to parse custom variable/uniform", e);
+				Iris.logger.warn("Failed to parse custom variable/uniform " + name + " with expression " + expression, e);
 			}
 		}