Merge back of some pynuts changes