Updated demo bugs