Minor solver-related fixes.