Adding some mathematica fixes