minor fixes on NP-188