Add fixes for homepage demo