Remove last vestiges of 'available' flag from nodes
Make 'id' and 'label' fields non-nullable
Merge pull request #177 from gsilvis/small-fixes

Two small fixes