Fix more problems with possibly missing metrics