Added in the missing updates from the last commit.