Various fixes for a seemless demo integration