Made corrections for recently merged patches.