WIP. Nodecellar fixes.