Integrate last-minute fix in rc script