Fixing some things in the add estate system