Small changes to Z3Solver