Tiny changes Don't ask NW2Var proxies Another PR problem fix Dunno how it slipped through the initial testing