Run Xcode upgrade
Fix server and transport layer delegate types
Type tweaks