Fix native issues