Revert "Revert "Revert "Minor changes"""

This reverts commit cb5ca0fa5999eb70f3b79d88e641c1208e9233c0.
Revert "Revert "Revert "Revert "Minor changes""""

This reverts commit f9e32bbe3527388c817d1483de2541001441e8d8.