Update to support Xcode 6.1, fixes for event capacity