Minor fixes
Revert "Minor fixes"

This reverts commit ab4d1a525c6e6c3f98fec301fe6ca90a49c17975.
Minor fixes