Also fix run_config not being resolved and make it a more proper fix