Fixes for Xcode beta.