Fixed some bugs in my recently submitted patch series.

5 files changed