Native build fixes