Fixes for node attrs