Tweaks to build native. 

Separated from other commits in native-tweaks branch.