Norb:
Estate fixes.