Fixes to make the ever-more pedantic Xcode happy
Fixes to make the ever-more pedantic Xcode happy