Treebook Demo Phoenix Fixes