minor adjustments
merge
minor adjustments
ios complilation fixes
ios compilation fixes
merge