Revert "Small Fixes"

This reverts commit 2e6b95446ee3ea41483c942deca6be72d87ac056.