Fix a few random issues with previous commit.