Library branch Phoenix Fixes for Demo

Library Phoenix Fixes To get More of the demos up and running.