nms: some fixes after deploy