Fix some problems with the previous commit.