Tiny changes for RP build.