Small fixes for solver factories

src/main/scala/inox/solvers/SolverFactory.scala

@@ -121,7 +121,7 @@ object SolverFactory {
   }
 
   def apply(p: InoxProgram, opts: Options): SolverFactory { val program: p.type; type S <: TimeoutSolver } =
-    p.ctx.options.findOptionOrDefault(InoxOptions.optSelectedSolvers).toSeq match {
+    opts.findOptionOrDefault(InoxOptions.optSelectedSolvers).toSeq match {
       case Seq() => throw FatalError("No selected solver")
       case Seq(single) => apply(single, p, opts)
       case multiple => PortfolioSolverFactory(p) {

src/main/scala/inox/solvers/combinators/PortfolioSolverFactory.scala

@@ -26,7 +26,7 @@ trait PortfolioSolverFactory extends SolverFactory { self =>
 }
 
 object PortfolioSolverFactory {
-  def apply(p: InoxProgram)
+  def apply(p: Program)
            (factories: Seq[SolverFactory { val program: p.type; type S <: TimeoutSolver }]):
             PortfolioSolverFactory { val program: p.type; type S <: TimeoutSolver } = new {
     val program: p.type = p