Bug #0087: Patch fixes for externals.