NW: fixing issues