Added changes that were missing from last commit.