Small stuff for transition node 0.8 => 0.10