Fixes some errors in Runo/Reindeer (#13334)

Change-Id: I5f19b8b03362035b4217dcda626d368559fc424d