diff --git a/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala b/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala
index 441245937..821efb20a 100644
--- a/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala
+++ b/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala
@@ -18,8 +18,7 @@ case class RpmMetadata(
   summary: String,
   description: String,
   autoprov: String,
-  autoreq: String) {
-}
+  autoreq: String)
 
 /**
  * The Description used to generate an RPM
diff --git a/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala b/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala
index c31bf8599..0a935e3cb 100644
--- a/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala
+++ b/src/main/scala/com/typesafe/sbt/packager/windows/WixHelper.scala
@@ -54,7 +54,7 @@ object WixHelper {
     // TODO - First we find directories...
     // Adds all subdirectories... there was a bug when there were directories with only subdirs and no files in the tree,
     // so there was a gap and dirXml failed to create some directories
-    def allParentDirs(f: File): Seq[File] = if (f == null) Seq() else Seq(f) ++ allParentDirs(f.getParentFile)
+    def allParentDirs(f: File): Seq[File] = Option(f).toSeq ++ allParentDirs(f.getParentFile)
     val filenamesPrep =
       for {
         f <- features