Added some changes that were missing from the last commit.