Multiple fixes for Tonga