Demo implementation fixes.