Fixing gadget-gen API incorrect paths etc