Some satisfiability fixes.