bug fixes for evoked demo