fixes in demo