Some fixes in AIsolver