Added some changes that were missing in my last commit.