Some forgotten changes from previous commit.