Corrections to pervious commit.