For the Nīsān release

Important bug fixes