Revert "Minor Fixes."

This reverts commit 74551bfdd4b5617ddf25840bef38a988ab78cea7.