Fixes from last commit.