Fix broken demoes + small consistency changes