Fix support for native targets