changes related to Xcode 6 Beta 6

It can be compiled again, but it will crash in a couple of situations
and is unstable.