Heir Fixes