Additions and fixes for Demo