Fixes from my last commit.