Fix NGN and some partials.