Attempt to fix config issues