Additions I forgot in the last commit.