Resolve node issues