Some quick fixes
Experimenting with binding context nodes