Updated to latest Nodelike commit