More fixes for Result.scala