Minor fixes to native packages