Address (hopefully final) Vale warnings