Getting ready for 2.1-rc1
Fixed a couple of undeclared rc variables.