318098b Add fixes for homepage demo