[TwigBridge] fixes