Make changes for Nutmeg upgrade