Updates to natpmp