Adding some missing build flags
Merge master into ios