fixes for native mode, add  to app