Fixes of previous commit.