Bring in more safety, to prevent warnings.
frameworks_av patch :)