Forgot these additions in the last commit.