Final corrections to setup.R