fixes for native types handling