A few updates to be compatible with R-3.02