Patch over class files to fix config dir issue