Fix nsm errors