Cfupgrade minor fixes.