More compatibility fixes in the demo