Natives unpacking optimized and other minor changes