Patched up the NSes in the examples