Fix hybrid build