Fix some issues with the previous commit.