Updated some changes missing from previous commit.