Tiny node environment fixes (2)