Minor Tuneups.
Pre revert commit.