fixes for higher-order nodes