Update to new geppetto
Missing fixes