Some minor Pipe content render improvements