Fix TNT Import issue with primary address; Other bug-fixes; Update TNT Import specs