Misc small changes.
Revert "Misc small changes."

This reverts commit 7b637c353e9624b9c279011fb46bb4f0c4cf1773.
Revert "Revert "Misc small changes.""

This reverts commit 98567325d5cb8f25946f0ab486b0bc695bc1db28.