Some fixes to the node gun