Patch to set config variables correctly