Update tree to new source and fix