Fixed a couple of bugs with the function node