Further general improvements.
Fix errors on Xcode 6.