Updated to beta 7
Fixed warnings and errors for Xcode 4