More unsat bug fixes