Start fixing configs, still broken