Adjust node queue and other aspects