Fixed compiler errors in rd-vanilla SP project.