small fixes for previous commit.