Further modifications for demo/standalone setup