Some basic changes and fixes for demo