Bug fixes for node