Fix Hybrid build