Fixes to make MathSAT5 work