Moz fixes in demo code