Small fixes to nw extension