Introduce overrides, fix config issues