NZ wraps up entry restrictions