Hopefully fix config issues