added some fixes to demos