Updates to work with latest node