Changes to build under R 3.0.0