Minor updates for Xcode 4.6 compatibility.