Heirs: Minor changes

Fix