Fixing classes in demo.