Minor fixes for Mathematica 9.0