Node save fixes