Fix compiling issues since Xcode beta5