Additional adjustments for demo of estate