Add pipe address when setting the data; Other small fixes