V5 stable nitfixes

a set of smaller corrections