Changes for RHOS Node 0.6 compat.