Fixes demo bugs that hampered re-use