Few fixes of non-production examples