Improving/fixing tidbits from last commit.