Pre demo fixes

look at change log