diff --git a/lib/OptimizationMOI/src/nlp.jl b/lib/OptimizationMOI/src/nlp.jl
index 2b8de1d89..0d3223c89 100644
--- a/lib/OptimizationMOI/src/nlp.jl
+++ b/lib/OptimizationMOI/src/nlp.jl
@@ -129,8 +129,8 @@ function MOIOptimizationNLPCache(prob::OptimizationProblem, opt; kwargs...)
     else
         [convert.(T, f.cons_hess_prototype[i]) for i in 1:num_cons]
     end
-    lcons = prob.lcons === nothing ? fill(-Inf, num_cons) : prob.lcons
-    ucons = prob.ucons === nothing ? fill(Inf, num_cons) : prob.ucons
+    lcons = prob.lcons === nothing ? fill(T(-Inf), num_cons) : prob.lcons
+    ucons = prob.ucons === nothing ? fill(T(Inf), num_cons) : prob.ucons
 
     evaluator = MOIOptimizationNLPEvaluator(f,
         reinit_cache,
diff --git a/lib/OptimizationNLopt/src/OptimizationNLopt.jl b/lib/OptimizationNLopt/src/OptimizationNLopt.jl
index 99c1024c2..96800ae99 100644
--- a/lib/OptimizationNLopt/src/OptimizationNLopt.jl
+++ b/lib/OptimizationNLopt/src/OptimizationNLopt.jl
@@ -177,8 +177,6 @@ function SciMLBase.__solve(cache::OptimizationCache{
 
     if retcode == ReturnCode.Failure
         @warn "NLopt failed to converge: $(ret)"
-        minx = fill(NaN, length(cache.u0))
-        minf = NaN
     end
     SciMLBase.build_solution(cache, cache.opt, minx,
         minf; original = opt_setup, retcode = retcode,