Updates for latest Xcode
Tweaks for sizing parameters