Wealth plan bug fixes