Removed a few redundant checks
Optimizations for NO_NODE compatibility