Update configurations and fix demo app