STE fixes for native