diff --git a/conf/quality-config/pmd-ruleset.xml b/conf/quality-config/pmd-ruleset.xml
index 012fa89c12927d759d8fe0730cdeabc0ab2b6344..d1ae4b3ea61acf2be754525db8135de799bc6cc7 100644
--- a/conf/quality-config/pmd-ruleset.xml
+++ b/conf/quality-config/pmd-ruleset.xml
@@ -78,6 +78,7 @@
 
 	<rule ref="rulesets/java/optimizations.xml">
 		<exclude name="LocalVariableCouldBeFinal" />
+		<exclude name="SimplifyStartsWith" />
 	</rule>
 
 
diff --git a/src/main/java/teetime/stage/FileExtensionSwitch.java b/src/main/java/teetime/stage/FileExtensionSwitch.java
index 7b39f3f9dffc41fdf0b2f50ffda295e27227d462..4fc98edf2544618f50bc1fc41a90524c933951c9 100644
--- a/src/main/java/teetime/stage/FileExtensionSwitch.java
+++ b/src/main/java/teetime/stage/FileExtensionSwitch.java
@@ -27,7 +27,7 @@ import com.google.common.io.Files;
 
 public final class FileExtensionSwitch extends AbstractConsumerStage<File> {
 
-	private final OutputPort<File> unknownFileExtensionOutputPort = createOutputPort();
+	private final OutputPort<File> unknownFileExtensionOutputPort = createOutputPort(File.class);
 
 	// BETTER use the hppc ObjectObjectMap that provide getOrDefault()
 	private final Map<String, OutputPort<File>> fileExtensions = new HashMapWithDefault<String, OutputPort<File>>(new ValueFactory<OutputPort<File>>() {
@@ -48,6 +48,7 @@ public final class FileExtensionSwitch extends AbstractConsumerStage<File> {
 		outputPort.send(file);
 	}
 
+	@SuppressWarnings("PMD.AvoidReassigningParameters")
 	public OutputPort<File> addFileExtension(String fileExtension) {
 		if (fileExtension.startsWith(".")) {
 			fileExtension = fileExtension.substring(1);