Various fixes in previous commit.