Some node fixes